fix portability issues that led to Hurd build failures

* src/build-system/configure(.ac):
  - Reflect the Hurd's support for -Wl,rpath,... .
* src/connect/ncbi_socket_cxx.cpp, src/connect/ext/ncbi_localnet.c:
  cope with missing PATH_MAX everywhere, not just under Windows.

Author: Aaron M. Ucko <ucko@debian.org>
Last-Update: 2020-09-19

Gbp-Pq: Name hurd_fixes

diff --git a/c++/src/build-system/configure b/c++/src/build-system/configure
index 237353c1be2d42605cd986c24f122c795360f0ca..4a45de55295f28e77b30fbba588a0a28a11a13a0 100755 (executable)
--- a/c++/src/build-system/configure
+++ b/c++/src/build-system/configure
@@ -10946,7 +10946,7 @@ if test -z "$CONF_f_runpath" ; then
       CONF_f_runpath="-R"
       ;;
     linux*:[GI]CC | linux*Clang | *bsd*:GCC | *bsd*Clang | cygwin*:GCC \
-    | osf*:GCC )
+    | osf*:GCC | gnu*:GCC )
       CONF_f_runpath="-Wl,-rpath,"
       ;;
     irix*:* | linux*:KCC | *:Compaq )

diff --git a/c++/src/build-system/configure.ac b/c++/src/build-system/configure.ac
index 67244eb73e7a791d623ff662180fbff40059ea16..0e5fcd08118067dfac696714abfb1ec9d4917717 100644 (file)
--- a/c++/src/build-system/configure.ac
+++ b/c++/src/build-system/configure.ac
@@ -2470,7 +2470,7 @@ if test -z "$CONF_f_runpath" ; then
       CONF_f_runpath="-R"
       ;;
     linux*:[[GI]]CC | linux*Clang | *bsd*:GCC | *bsd*Clang | cygwin*:GCC \
-    | osf*:GCC )
+    | osf*:GCC | gnu*:GCC )
       CONF_f_runpath="-Wl,-rpath,"
       ;;
     irix*:* | linux*:KCC | *:Compaq )

diff --git a/c++/src/connect/ncbi_localip.c b/c++/src/connect/ncbi_localip.c
index a021d89e6322e4722c50ef9cb138345bb2b63126..d9c8120f10f05115aea18cb2f6f2a348b7bd862a 100644 (file)
--- a/c++/src/connect/ncbi_localip.c
+++ b/c++/src/connect/ncbi_localip.c
@@ -68,7 +68,7 @@
 #  define INADDR_LOOPBACK  0x7F000001
 #endif /*!INADDR_LOOPBACK*/
 
-#if defined(NCBI_OS_MSWIN)  &&  !defined(PATH_MAX)
+#if /* defined(NCBI_OS_MSWIN)  && */ !defined(PATH_MAX)
 #  ifdef _MAX_PATH
 #    define PATH_MAX  _MAX_PATH
 #else

diff --git a/c++/src/connect/ncbi_socket_cxx.cpp b/c++/src/connect/ncbi_socket_cxx.cpp
index 9b65865674576e670ae2b5e688b7730b387d0533..b1d7ce9e10f91ac7d8e3b3a20e4e3bb96ff63f08 100644 (file)
--- a/c++/src/connect/ncbi_socket_cxx.cpp
+++ b/c++/src/connect/ncbi_socket_cxx.cpp
@@ -35,7 +35,7 @@
 #include "ncbi_assert.h"                // no _ASSERT()s, keep clean from xncbi
 #include <connect/ncbi_socket_unix.hpp>
 #include <limits.h>                     // for PATH_MAX
-#if defined(NCBI_OS_MSWIN)  &&  !defined(PATH_MAX)
+#ifndef PATH_MAX
 #  define PATH_MAX 512                  // will actually use less than 32 chars
 #endif // NCBI_OS_MSWIN && !PATH_MAX